This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

Thanks for reviewing! I added the image.yaml now.
This newline differences are some default configuration in VScode, I am fixing it right now.

This is looking close! I think we also want the image.yaml from next-devel.

Also, it looks like there's some minor end of file newline differences in the lockfiles (this is minor but it shows up in a git diff between the two, and it'd be nice to have that diff be minimized to the strict necessary). Something like this should work:

git restore --source=origin/next-devel image.yaml manifest-lock*
git add image.yaml manifest-lock*
git commit --amend --no-edit

I have two questions:

1 - In the manifest.yaml file in next-devel, there is this part at the end:

conditional-include:
  # we only want these in next for now; see
  # https://github.com/coreos/fedora-coreos-tracker/issues/1375
  - if: basearch == "x86_64"
    include: manifests/crun-wasm.yaml
  - if: basearch == "aarch64"
    include: manifests/crun-wasm.yaml

Should it be included too?

2 - The other question is about the red circles in my PR who suggest that there is a empty line in some files. I already fix it in my vscode settings and committed applying the changes, but is still appearing here. Do you have any idea how to solve it?

Thanks 😸

I have two questions:

1 - In the manifest.yaml file in next-devel, there is this part at the end:

conditional-include:
  # we only want these in next for now; see
  # https://github.com/coreos/fedora-coreos-tracker/issues/1375
  - if: basearch == "x86_64"
    include: manifests/crun-wasm.yaml
  - if: basearch == "aarch64"
    include: manifests/crun-wasm.yaml

For now, no. We may remove that bit soon separately (see #2690).

Should it be included too?

2 - The other question is about the red circles in my PR who suggest that there is a empty line in some files. I already fix it in my vscode settings and committed applying the changes, but is still appearing here. Do you have any idea how to solve it?

Hmm, I'm not sure. It may still be VS Code playing tricks. The surest way to squash those is to do it from the command-line instead using the commands I provided in #2719 (comment).

@jlebon I was able to fix it, finally. I think everything is okay now.
Thanks a lot! 😸

OK, this is looking great! But the manifest.yaml has unwanted changes. I might've misunderstood your question 1 in the previous comment. Apart from the releasever change, manifest.yaml needs to stay the same.